auto merge of #901 : alexcrichton/cargo/update-faq, r=brson
authorbors <bors@rust-lang.org>
Tue, 18 Nov 2014 23:44:24 +0000 (23:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 18 Nov 2014 23:44:24 +0000 (23:44 +0000)
Closes rust-lang/crates.io#21
Closes rust-lang/crates.io#29
Closes #882


Trivial merge